integrate @dsander's suggestions
Andrew Cantino
2 changed files with 14 additions and 19 deletions
+ 9
- 11
app/assets/javascripts/pages/agent-edit-page.js.coffee
@@ -136,24 +136,22 @@ class @AgentEditPage |
||
| 136 | 136 |
$source = $($(this).data('source')).hide()
|
| 137 | 137 |
editor = ace.edit(this) |
| 138 | 138 |
$(this).data('ace-editor', editor)
|
| 139 |
- editor.getSession().setTabSize(2) |
|
| 140 |
- editor.getSession().setUseSoftTabs(true) |
|
| 141 |
- editor.getSession().setUseWrapMode(false) |
|
| 139 |
+ session = editor.getSession() |
|
| 140 |
+ session.setTabSize(2) |
|
| 141 |
+ session.setUseSoftTabs(true) |
|
| 142 |
+ session.setUseWrapMode(false) |
|
| 142 | 143 |
editor.setTheme("ace/theme/chrome")
|
| 143 | 144 |
|
| 144 | 145 |
setSyntax = -> |
| 145 |
- syntax = $("[name='agent[options][language]']").val()
|
|
| 146 |
- if syntax == 'JavaScript' |
|
| 147 |
- editor.getSession().setMode("ace/mode/javascript")
|
|
| 148 |
- else if syntax == 'CoffeeScript' |
|
| 149 |
- editor.getSession().setMode("ace/mode/coffee")
|
|
| 150 |
- else |
|
| 151 |
- editor.getSession().setMode("ace/mode/text")
|
|
| 146 |
+ switch $("[name='agent[options][language]']").val()
|
|
| 147 |
+ when 'JavaScript' then session.setMode("ace/mode/javascript")
|
|
| 148 |
+ when 'CoffeeScript' then session.setMode("ace/mode/coffee")
|
|
| 149 |
+ else session.setMode("ace/mode/text")
|
|
| 152 | 150 |
|
| 153 | 151 |
$("[name='agent[options][language]']").on 'change', setSyntax
|
| 154 | 152 |
setSyntax() |
| 155 | 153 |
|
| 156 |
- editor.getSession().setValue($source.val()) |
|
| 154 |
+ session.setValue($source.val()) |
|
| 157 | 155 |
|
| 158 | 156 |
updateFromEditors: -> |
| 159 | 157 |
$(".ace-editor").each ->
|
+ 5
- 8
spec/models/agents/java_script_agent_spec.rb
@@ -31,14 +31,11 @@ describe Agents::JavaScriptAgent do |
||
| 31 | 31 |
expect(@agent).to be_valid |
| 32 | 32 |
@agent.options['language'] = 'foo' |
| 33 | 33 |
expect(@agent).not_to be_valid |
| 34 |
- @agent.options['language'] = 'javascript' |
|
| 35 |
- expect(@agent).to be_valid |
|
| 36 |
- @agent.options['language'] = 'JavaScript' |
|
| 37 |
- expect(@agent).to be_valid |
|
| 38 |
- @agent.options['language'] = 'coffeescript' |
|
| 39 |
- expect(@agent).to be_valid |
|
| 40 |
- @agent.options['language'] = 'CoffeeScript' |
|
| 41 |
- expect(@agent).to be_valid |
|
| 34 |
+ |
|
| 35 |
+ %w[javascript JavaScript coffeescript CoffeeScript].each do |valid_language| |
|
| 36 |
+ @agent.options['language'] = valid_language |
|
| 37 |
+ expect(@agent).to be_valid |
|
| 38 |
+ end |
|
| 42 | 39 |
end |
| 43 | 40 |
|
| 44 | 41 |
it "accepts a credential, but it must exist" do |